Merge "Update HWUI tests to use minikin to layout fonts." into nyc-dev