Fix the build

Revert "am 047f9d12: Merge "resolved conflicts for merge of ce6766ea to honeycomb-plus-aosp" into honeycomb-plus-aosp"

This reverts commit 352f2c33d3b8a0b73dcdab98c7a77f698578b048, reversing
changes made to ce8a55db6feae11c1db45a868a7d8a0e7d105471.
1 file changed