Bug 915032 : change buri, leo, and helix to flash gecko/gaia by default and -f option to override to flash via fastboot

patch to clean nits