Merge "Merge "Convert libhwui to Android.bp" am: 31fb17bbf9 am: f0d951361b am: ab8ed8b4e4  -s ours" into oc-dev-plus-aosp