Merge "Convert libhwui to Android.bp" into oc-dev-plus-aosp