Follow cleanup of build.gradle files to use AndroidSupportPlugin fully.

Test: None
Change-Id: Ifa5c5b9bdb930179e3b245c0434b91a9502c69fc
2 files changed