otatools: re-add -r option to remove recovery from ota package
Replace build ID in package name with platform version