am 026ba931: (-s ours) Merge "Fix the build." into honeycomb-plus-aosp

* commit '026ba931d448919ffc515f7e66fe96950f89d22e':
  Fix the build.
tree: c9f317dc1506f2ca0c32c401419aef6d607b2fe0
  1. core/
  2. services/