[ossfuzz] catching up with upstream changes am: abb7a18cbd am: be4ffac51a am: 29b86236a6 am: 5e683e8a4c Change-Id: Ieb33e4c449e2c41cec845c500ab391dac2bd6ba7