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

Change-Id: I6c15fb5b0bf6f3ea86fedf22198d926978e5f00e