Merge "Build tests against ICU impl, not stubs"
am: 1152b39032

Change-Id: I21c5027e3f5975b38c933b426f186d0a64ac20c8