Merge "Stop using Arrays.checkOffsetAndCount."
am: ca3450b524

Change-Id: I9652cdbab5e0b5e0777611ebd013df6c30fc61c5