Merge "Revert "Expose libicuuc_headers to ExtServices""