DO NOT MERGE. Make doclava use fullsdk android.jar.
am: 3edb1fadc1  -s ours

Change-Id: I54cdcc64189d5fe88643b790dcd3ff53d7ba9d0b