Merge "cosmetic: 1)typos 2)parameters named for clarity" am: 36a0a138 am:...

Merge "cosmetic: 1)typos 2)parameters named for clarity" am: 36a0a138 am: d2560c3e am: fcbda828 am: 8865d9a9

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

Change-Id: I31eda9a48425dbf150978fdd5f338582b6d69232