Revert "O is API 26."

This reverts commit 06fc7e023b1db7f020171a1748d9743af5d21e6c.

Reason for revert:  b/37355569

Bug: 37480230
Bug: 37355569
Change-Id: I2eef4fb5369fa4e9d7a410461de63d4dd43dfc09
1 file changed