Merge "Do not use hidden API ArrayUtils"
am: d6754f0353

Change-Id: I593a091d5fb2d380c1e17086f55a3079b8f74fd5