Merge "Copy prebuilt objects to the intermediates directory" am: 8d0e466f19 am: 25a43ee488

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

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