Merge "Generate new makefiles for fuzz tests." into pi-dev am: efdff6f442 am: 8d45e800e6
am: e5c6003b56

Change-Id: Iff10bdb364dfa529892283ac4cb3ede5738b57ef