O is API 26

Bug: 37480230
Test: build, boot
Change-Id: Idfa91e1e094606f92c4141beb8569c241c639ee1
(cherry picked from commit 9bcef8e2da32ba959b61a0b400adfe9fde1a2a10)
4 files changed