Merge "typos fixed" am: 92a21ddb41 am: 16e222bc2a am: ad13d5bdf1 am: 50982cb46e am: 845e911391

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

Change-Id: I996e1ef0b6cc147c66eb6cb1e9c04c7afd9f8210