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

Change-Id: Iecc8133f230c717217c182038ed97fded39d3635