Bug 811780 - Provide an option for creating a blank SD card image when running against an emulator. r=jgriffin
Bug 913749 - Mark fallible unbox instructions as guards. r=h4writer

--HG--
extra : rebase_source : f064535983782dcd52791f977f16a21d83603381