Android 4.3 release 2.3
Merge "Simplify makefile."