[automerger skipped] Merge "Rename BuildDir and NinjaBuildDir." am: 5602d330...

[automerger skipped] Merge "Rename BuildDir and NinjaBuildDir." am: 5602d330 am: 8526bc95 -s ours

am skip reason: Merged-In I2fcd80a9e376a6842a06aa104a9f6f5c5e16f8c7 with SHA-1 c9601434 is already in history

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

Change-Id: I4a00c60cae2b7eda36aaad0037a31658a1517960