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

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

Change-Id: If085d93a11035ba47310bddafd94e4c19f83ff19