Merge "Switch hwui to google-benchmark" into nyc-dev