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

Change-Id: I25dd726dd94f6fe8c08cdfcbaeb1ad21ee2b5a60