[automerger skipped] Merge "Do not use hidden API ArrayUtils" am: 7c582b5d...
[automerger skipped] Merge "Do not use hidden API ArrayUtils" am: 7c582b5d am: a95999b7 am: 48939fde -s ours
am skip reason: Change-Id I470ead7d5cda7d3b042c636a907f1695289201c4 with SHA-1 b1e968ee is in history
Change-Id: Ib67d126b6d8f85da1a4cb32a16d74821725f63e8