Android 4.3 Release 3.1
Merge "Simplify makefile."