am c41d038e: Merge "Fix System.arraycopy"

* commit 'c41d038e5f55d993b6074e1567c268fb170b6c41':
  Fix System.arraycopy