Merge "GpuStats: refactor single stats pieces into a uniform way am: b1c1a377a8 am: ff7d816260" into qt-qpr1-dev-plus-aosp