Android 4.3 release 3.0
Merge "Simplify makefile."