[automerger skipped] Merge "Fix fuzzer builds [#3]." am: c739c3006a am: 51fbe3a958 -s ours
am: a6588e41a7 -s ours
am skip reason: change_id Id6540dcc144113ede591e7326715ef8d1e01863d with SHA1 c2049af08a is in history

Change-Id: I34640424281e08ba51757709d608e59dae490362