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

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