Merge "GpuStats: plumb all 3d api versions" into qt-dev am: 83d8463a39
am: 4db40d8490

Change-Id: I1493219dd9b9c7c4275b392c8ee8e5738f74d2ef