Revert "Revert "O is API 26""

This reverts commit 12025857cdbf9083a9ddcc834ec0d3837bcbfe0b.

Bug: 37480230
Bug: 37355569
Change-Id: I315b8c18a79d0dcd6be84c3d2af120b073144a9e
4 files changed