Merge "Merge "Remove uncessary dependency of libhwui" am: df36be5f am: eebd7d79 am: 558e5dac am: ffa46b20"