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
am: 2ad84dbf36  -s ours

Change-Id: Ia0300aaa05b3991d4086cbc91202889faacd7cd3