Merge "Remove --skip-kati" am: c8cea365 am: d60cc478 am: 46494f29

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



Change-Id: I1a806d4823878df024b646d8e8f2b13efb1a81f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>