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

Change-Id: I30dee10c1e024777a3760d37cf5a80e79c083b2a