manifest: kill gcc4.7 && fix merge errors

Change-Id: Ieb73433abfada4fec8052a3416a131d8bed5fb00