Merge "Remove _kwmarker" into main am: c50601ab am: 1d1abfed am: 222a155d

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



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