Merge changes from topic "simpleperf_presubmit_check" am: 4ddb2ed827 am: e31e0e7d4c am: 71ad76efba

Change-Id: I5800c126ecebd3aa7eda5366b5745c23857e0dde