Merge "Revert^2 "Remove hidden System.arraycopy(byte[]....""
am: 80cd52683c

Change-Id: I4b505b5ee05b3ba64304b8bd75eda5f56e6e690d