Revert "Revert "O is API 26.""

This reverts commit 75feb8927ae20fc9ab3d0a256c1784aadacd3020.

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