Merge changes from topic "revert-1899703-AMWIVCREEV" am: 67938c2925

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

Change-Id: Ie9cf2ab1249044ce0b52b8511c0a49e11f74a484