am cb6fbf88: am a7600364: fix tiny android build

* commit 'cb6fbf88db9e29f761045dbe9ece975f178ff71e':
  fix tiny android build