DO NOT MERGE. Fix builds when fullsdk is missing.
am: 3146f0b1ce  -s ours

Change-Id: I50f43edc8c04f3d5c15264f4053c9f89a3757777