Merge "simpleperf: Update apks for testing ApiProfiler."
am: 3c9e6a09ca

Change-Id: I801bed79640c429244a929bcfe35afe850ba5d26