Simplify makefile.

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

Android 4.3 release 2.1