Merge "DO NOT MERGE. Fix builds when fullsdk is missing which is the case for stage-aosp-master" into stage-aosp-master