Android 4.3 release 1.1
Merge "Simplify makefile."