am b255560b: Merge "Fix build" into gingerbread-plus-aosp

Merge commit 'b255560b35f8d776a71a9e8adb127e17c704466e'

* commit 'b255560b35f8d776a71a9e8adb127e17c704466e':
  Fix build