Merge "Fix fuzzer builds [#3]."
am: c739c3006a

Change-Id: I4bc0856fc4d7cc9eed162135efcaa715f73ca0b0