tree b7765afacde4fcf148d7d3b1aa1ec58f14797f55
parent 9624a7f9d419862d9271e0c219fb56116a236a81
parent b425901a8c9807faeddd080482b83ab34ab0a8db
author Neil Fuller <nfuller@google.com> 1556267474 -0700
committer android-build-merger <android-build-merger@google.com> 1556267474 -0700

Merge "Revert^3 "Remove hidden System.arraycopy(byte[]...."" am: 48874272ee
am: b425901a8c

Change-Id: I768aaad3f0c053be9654de4d4611ca4c9f403515