Bug 910092 - misc residual changes to android emulator test config, AVD build script and unit test script, r=gbrown

--HG--
extra : rebase_source : d2eff1a7376c07c9427a413248b2fa777d4b6915