Merge "Convert libhwui to Android.bp"
am: 31fb17bbf9

Change-Id: I66401c892f90131e21efb36dc7316f905bd729d2