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

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