Merge "Perfprofd: Fix script dependency" am: 0cce4c57e1
am: aaf182717b

Change-Id: I6e1a0233a9cc04a918913d42e7f602d8316ed988