am 8ba16551: Merge "Fix build." into honeycomb-plus-aosp

* commit '8ba16551bc11379e7c1b1815612909e2515d0cb2':
  Fix build.
tree: 4255f5e984dd1961daa5edd69e27b9f7717bc420
  1. core/
  2. services/