Merge "Fix build." into honeycomb-mr2