Merge "Revert "Fix test to use --experimental_platform_in_output_dir."" am: 7b568c1cea am: 2ddc1eb1fa

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

Change-Id: I53b7788a0a3da48fe47a8e8240f8f41bab0f74d6