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

Change-Id: I52849c0e9f222e5f7c7297aa716ea762b171458d