Fix the build

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

This reverts commit fbba87d35ff2622323b0992ede22b4255fd72495, reversing
changes made to ce8a55db6feae11c1db45a868a7d8a0e7d105471.
1 file changed
tree: c9f317dc1506f2ca0c32c401419aef6d607b2fe0
  1. core/
  2. services/