Merge "Revert "Determine build_ota_package based on recovery.fstab install...

Merge "Revert "Determine build_ota_package based on recovery.fstab install location"" into main am: d664f628

Original change: https://android-review.googlesource.com/c/platform/build/+/3463140



Change-Id: I3f87c4e293498abd7cc195d104420bc8d39c9cdb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>