Merge "Opt hwui_unit_tests (and benchmarks) out of test runner sharding"