am 70d3c707: (-s ours) Merge "Remove PinyinIME from target config - DO NOT MERGE"

* commit '70d3c707caa45968508d45c703b0edb13199b5ea':
  Remove PinyinIME from target config - DO NOT MERGE