[automerger skipped] Merge "Do not use hidden API ArrayUtils" am: d6754f0353 am: 927fcecc7b am: 03335a48ab -s ours
am skip reason: Change-Id Idbedd4a24adad8c7980c2a4c0c912c8a8d0753f1 with SHA-1 103220beac is in history

Change-Id: I9227913e8142cf02affb78265d8d9f596e7edd22