Merge "Fix assertArrayEquals() calls with bogus 3rd parameter"