Revert^5 "Use Soong-built system/build.prop" am: 0b2f48f0

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



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