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

Change-Id: I4e40ac80bb0e043e92a562f939a0ad5f59311b91