Merge "Disable integer overflow sanitizer in grep." am: 3946d93023
am: a93741ec87

Change-Id: I6d09399db47f13206cc8eab480491511d6170c26