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
am: 799195502c  -s ours

Change-Id: If94e83088c575d18318668d8b9127b15c25fffeb