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

Change-Id: Idb6e09b061dbf836ae0207fd2b7ecf203568f027