Android 4.3 release 2.2
Merge "Simplify makefile."