Merge "Revert "Remove hidden System.arraycopy(byte[]....""
am: 0849145a05

Change-Id: I94eba03d50197c0556a3f4bb649df2ce505cb40a