Merge in some android customizations. Minor cleanup.

Required to generate API diffs for platform SDK and Support Lib.

Test: ./gradlew generateDiffs for Support Library
Change-Id: Id00a3b420214057e9b2b0f51007a5f26f4b0fb3a
15 files changed