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

* commit '8ba16551bc11379e7c1b1815612909e2515d0cb2':
  Fix build.