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

Change-Id: Ie349d13bc8179d19bc22628df3d9a56fb2d947d1