Merge "Merge "Convert libhwui to Android.bp" am: 31fb17bb am: f0d95136 am: ab8ed8b4 -s ours" into oc-dev-plus-aosp