Bug 997029 - Don't build Gaia when ./flash.sh gaia
Bug 997029 - (follow-up) Default to /system/b2g
Merge pull request #340 from timdream/push-only-for-flash-gaia

Bug 997029 - Don't build Gaia when ./flash.sh gaia, r=mwu
Bug 1009753 - Check for TARGET_DEVICE r=gsvelto
Merge pull request #349 from lissyx/bug1009753

Bug 1009753 - Check for TARGET_DEVICE or TARGET_BOARD_PLATFORM r=gsvelto
Merge remote-tracking branch 'upstream/master'

pulled in latest mozilla commits