Make the build more fuzzer-friendly am: daa03715de am: 6a8a4ed7ed am: 39129dd686
am: c411041879

Change-Id: I25b8f11e1ebde5d324dba3f475b5b6f3807af33e