Improve compatibility with non-CM builds (specifically boot2gecko/FirefoxOS)

Change-Id: I3f0417eb065069b279ce72c46893401359122148