More generate_mozbuild fixes

Change-Id: Ib51cb95e07790121f76cef41fe5473dfdfbc61d2