Merge "Make OutDir() and SoongOutDir() be consistent." am: 5eeb6fc3f2 am: e908fea7d2 am: ded8816965

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

Change-Id: Ida53d0cbb5aa5f4f2a54b9f6498d3e700a38e616