Merge "Fix Error Prone ArrayEquals/ArrayHashCode bugs" into oc-dev am: 69bf3ea86d
am: 27c0596f1c

Change-Id: I690196a85d42b7f56b54e71e2df2d96f93fa323f