Bug 985837: Try forcing make -j4 for emulator-kk builds to workaround make crash. r=aki
Bug 985837: Follow up bustage fix. self.target doesn't exist, should be self.config['target']. r=bustage
Bug 967704 - Update mozharness config for more Android 2.3 M/R/J chunks; r=kmoir
Merge default -> production

--HG--
branch : production