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

Change-Id: I828305f65fc664310fac14961bcb797316c3b87e