am a6c402fb: Merge change 27212 into eclair
Merge commit 'a6c402fb0ec4298413e1d37c53f0524ea3325854' into eclair-plus-aosp * commit 'a6c402fb0ec4298413e1d37c53f0524ea3325854': Fix the build.
This commit is contained in: