master
Bug 2030985 - Remove CRMF from testing and manifests r=keeler
Bug 845556, follow up patch to adjust the Android testing for the new directory layout, r=bustage