Android o preview 4
Merge "Fix the byte ordering behaviour of the UTF-16 Charset."