Android 4.3 release 2.1
Merge "Simplify makefile."