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

Change-Id: I5a4126514616eafaf5f1d5431b6d3eb28ffb34a3