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