Merge "DO NOT MERGE. Fix builds when fullsdk is missing which is the case for stage-aosp-master" into stage-aosp-master am: 8a38b69a20  -s ours
am: e63a7a4820

Change-Id: I75e369008b5a5654093cbfb34e313f60884d4c27