Bug 901387 - b2g.json cleanup and reorder. r=jgriffin