Android p preview 1
Adapt to upstream changes.

Test: make checkbuild
Bug: None
Change-Id: Idf57f13494b2e14b12dbd19a220d45d79d54d692
1 file changed