Merge "Merge "Merge "jni: EventLog replace open coding with android_log_event_list" am: 19818124 am: de04a048" into nyc-mr1-dev-plus-aosp am: 8d8cfa23" into nyc-mr2-dev-plus-aosp