Android O MR1 IOT Release Smart Display r30 (OIMI.200528.001)
Merge "C++17 compatibility: `register` is no longer a keyword."