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

* commit '5855c2161a6cd93fb62c6d2326d9e2f7517f7fa7':
  Remove PinyinIME from target config - DO NOT MERGE