Merge "Separate logic for alg selection for OTA and APK signing."