Merge "New debugging tool in adb shell dumpsys gfxinfo"