Merge "simpleperf: build cts test running in app context." am: ff972054e9
am: 5710e45719

Change-Id: Ifdaf61899cf5c89055ebf047fd090d94b2ea6764