Merge pull request #10670 from rexboy7/fixhd-887742

Fix bug 887742 - Let GAIA_DEV_PIXELS_PER_PX valid for files in resources/branding
Conflicts:
	build/webapp-zip.js
Merge pull request #10748 from ochameau/bug889384

Bug 889384 - Windows desktop B2G build failure during webapp.zip packaging. r=timdream