Simplified browserify process

Conflicts:
	test/_common.js

Change-Id: Ib7a64fc4fabc9d85ed664c067bec3f3c712cdb94