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

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

Change-Id: If40a15f83227bfb83ea254249779a8914b6b900d