Merge "Remove uncessary dependency of libhwui"