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

Change-Id: Iaf82609bdb29a4b5305c8e87e5dae87deb146dde