DO NOT MERGE. Fix builds when fullsdk is missing. am: 4a6b971c11  -s ours
am: ac3102d615  -s ours

Change-Id: Ida22196b9127c98e200ba44f057220e811c50525