Merge "Remove hidden System.arraycopy(byte[]...."
am: 30bc334d39

Change-Id: I4d785af76c6cc98778aff5c9c49bd862b55a8a59