Android O MR1 IOT Release Smart Display r39 (OIMJ.201212.001)
Merge "Add four memory events to atrace.rc"