Try to fix some builds.

Broken builds: aosp_x86, docs, full, sdk_phone_armv7.

I cannot reproduce the break locally, so making my best guess on the fix.

Test: it still builds
Change-Id: Icf86c3502fede66dba815458b66f2ebdf33afe91