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

Change-Id: I86197faf983f47228042d8253fdd6c010ea7cb2c