Merge "Merge "jni: EventLog replace open coding with android_log_event_list" am: 1981812450 am: de04a0480a am: 0fbd9b7773" into nyc-mr2-dev-plus-aosp