Merge "Fix the byte ordering behaviour of the UTF-16 Charset." am: 4a2d046c17 am: 32a3cd748f
am: 1aa28a3cfc

Change-Id: Ib6abfdbfeed2810c88ad994ceb1f8e8e52aba14c