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

Change-Id: Id3c170a155aebc448b41091604d57f85e3c411a5