Updated simplified Chinese translations

Change-Id: If19a4ca932187093441859db94ded85915aa9202
ROMControl: Remove Duplicate String

Commit was rebased and this accidentally
    added back

Change-Id: Ie5bfdee86a619c55bece2be8b60dbd595cfa735b
Merge remote-tracking branch 'upstream/jb-mr1' into jb-mr1