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

Change-Id: If7b5882deac65c90eb0e4a53ea15ccd3b6045321