Merge changes from topics "bp2build-gensrcs", "bp2build-gensrcs-gendir" am: a1675a539f

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

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