Cherry-pick the useful part of Icf882af (Android.mk) and address earlier comments.

Change-Id: Iae992b05c714ec332b3931d46ad7a6ab246aee92
2 files changed