Merge "Add more tests for libhwui"