Merge "expose hwui frame stats through FrameStatsObserver"