Merge "Remove unnecessary HWUI host build customization" into main