Merge "DO NOT MERGE. Fix building support library using gradle in AOSP."
am: 7928843f58  -s ours

Change-Id: Iaa9d67a9c86232d690f137ee51e052bde4552c86