Merge "Remove all noicu build rules"