Merge "Add stubdata/Makefile.in back so icu4c will build for host testing."