Merge "[HWUI] Remove references to gui/Surface."