Another tweak to build_android for smaller binary size