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

Change-Id: Id1874723c504c84ed6b3b582a258dd31d2b4dce1