am 7fec1b73: Merge "Clean up some of the Android icu4c hacks."

* commit '7fec1b7373f2af22744e8cf0b1a93636f13f0331':
  Clean up some of the Android icu4c hacks.