Merge "Do not use hidden API ArrayUtils"