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

* commit 'e046555b4d92179327d12d888be967fff5c027ca':
  Fix build.