Merge "libandroidfw: fix build error for 64-bit"