Merge "Remove uncessary dependency of libhwui" am: df36be5f17 am: eebd7d7970 am: 558e5dac4d
am: ffa46b2053

Change-Id: I9018e4e53e84373efda8772db48f9d2446629d53