fix for bug 915034
Merge branch 'bug915034' of https://github.com/nhirata/B2G into bug915034

Conflicts:
	flash.sh