am feb3d6d: Merge change 877 into donut

Merge commit 'feb3d6d8db30f51c560e792ef3d9eca01d9cae9d'

* commit 'feb3d6d8db30f51c560e792ef3d9eca01d9cae9d':
  adb seems to build in 64 bit mode these days, so it's safe to build for the simulator too.