Merge "convert Uibench test to aapt2"