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

Change-Id: I79cbc9d15084b8c8f4f120cd72eccae30558c33b