Revert "O is API 26"

This reverts commit 9bcef8e2da32ba959b61a0b400adfe9fde1a2a10.

Reason for revert:  b/37355569

Bug: 37480230
Bug: 37355569
Change-Id: I39b4a7fd9bda77df0746c7bc32b87f0c2b722f2b
(cherry picked from commit 12025857cdbf9083a9ddcc834ec0d3837bcbfe0b)
4 files changed