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

Change-Id: I501f8183e90e1fd783e1f62e0a9f2d8a6b89db01