Merge "Add instrumentation test support to app_profiler.py"
am: 2083cfad2c

Change-Id: Ibbf899eec04b1ba17eed68ae781c95700d345049