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

* commit '026ba931d448919ffc515f7e66fe96950f89d22e':
  Fix the build.