Merge "bp2build kotlinCFlags" am: d184706daa am: 54bfcc938f

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

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