Merge "Unconditionally copy the system build.prop into target_files archive"...

Merge "Unconditionally copy the system build.prop into target_files archive" am: 5709c4a9 am: 5efc0fee am: c0db3151

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

Change-Id: Ic00a587220728e5ad253c1407381074f2fa37ba0