Merge "DO NOT MERGE. Fix building support library using gradle when full-sdk is missing." into nyc-support-25.1-dev
am: d931769e00  -s ours

Change-Id: I4d7a39d6ef19920f3e4b19400c84f277889b5c9f