Merge "Fix build." into honeycomb-plus-aosp