Merge "Do not write past end of inotify event structure. am: 855803fd4a am: 1da9219007 am: d68122fa47 am: 645a15ae7e am: 3063fed76d" into sc-v2-dev-plus-aosp