Merge "Don't infer the default boot image location in otapreopt."