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
am: 68195981ae  -s ours

Change-Id: I580282e3d96083c6c8f56ef75a2f4f8c59a5b1f0