Merge "app: aboot: add recoveryfs into known partition types,"