DO NOT MERGE. Fix builds when fullsdk is missing which is the case for stage-aosp-master am: f5461cddba  -s ours am: 74439496fd
am: 02489ac03a  -s ours

Change-Id: I3fea8bc1fed136efe8651eae92929276b4ab87fa