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

Change-Id: Ic0dff05b13b40b9400a986cc0ee5b2f3b1ece3ea