am 5cb05eea: Merge "Fix build." into honeycomb-mr2

* commit '5cb05eea289559b30cf4f84130cb6afba0921638':
  Fix build.