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

Change-Id: If4bda3f676918dc5a25bb62338fd06a25a39cb48