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

Change-Id: I48df76da30c24e7daf960b870c40e830a49c8024