Revert "O is API 26"

This reverts commit 8713882bb8d082f997fa68b75606caa48a45862d.

Reason for revert:  b/37355569

Bug: 37480230
Bug: 37896931
Bug: 37355569
Change-Id: Ic07d948fd0b4a0a8434e1f4f0c8e559c4258cf5e
1 file changed