DO NOT MERGE. Fix building support library using gradle when full-sdk is missing.
am: 0a1d5c9626  -s ours

Change-Id: I1eac8d14ea71810740d23e4dedbc4557e2e79ad1