Merge "Perfprofd: minimal quipper fix for PERF_RECORD_THROTTLE" am: bc0c17b7ce am: 588e5dda2a
am: dd94c8916a

Change-Id: I01752dd765eaf2db5b9bcac16fd08e725da8586b