am b1903653: am 128599e4: am 2b3c14bf: Merge "libandroidfw: fix build error for 64-bit"

* commit 'b1903653e4177a9394d7c30e3834fc8469485325':
  libandroidfw: fix build error for 64-bit