Android O MR1 IOT Release Smart Display r30 (OIMI.200528.001)
Merge "Add four memory events to atrace.rc"