Merge "Remove unused code from HWUI Layer"