[automerger skipped] Merge "GpuStats: refactor single stats pieces into a uniform way am: b1c1a377a8 am: ff7d816260" into qt-qpr1-dev-plus-aosp
am: d3ea8784d5 -s ours
am skip reason: change_id I2907065a55d03a6c1494737e6f0a77f6e94272eb with SHA1 bcba411794 is in history

Change-Id: Ic07b84178d8f73dad16513f4170d587cc7bbddb9