Simplify makefile.

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

Android 4.3 release 2.1