Merge "Perfprofd: Fix AndroidTest.xml" am: 410c1f1e75
am: b7a9245ef1

Change-Id: Id673835edf25e0d055914f7fff10983ff04fadc4