fix errors that stopped from compiling with aosp prebuilt arm-eabi-4.8