Merge "Bunch of tweaks need to make gtest pass on the device. Android.mk changes will be sent in a separate CL."