Merge "Convert libhwui to Android.bp" am: 31fb17bbf9 am: f0d951361b
am: ab8ed8b4e4  -s ours

Change-Id: I483940304816785a10c8eaa5eff0def36c6d0a0d