Merge "Revert android changes to java.util.Arrays.deepEquals0."