Simplify makefile.

Change-Id: Idab981e1534d4a3f3f1c24dae1ca34859b41ee52
Merge "Simplify makefile."
Merge tag 'android-4.3_r2.1' into jellybean-mr2.1

Android 4.3 release 2.1