Merge "perfprofd: Use testdata in Android.bp." am: 30257fab6d am: 9f559bc6c7 am: b91608dead
am: a4180d8e26

Change-Id: I6f359f2de3e309182fad4be999c858042a49964d