Merge "Convert libhwui to Android.bp" into oc-dev-plus-aosp
am: 6a6163d023  -s ours

Change-Id: Ifaf273ae3841d516fa6b644d7893977334dabf49