Merge "Convert includes/inherits inside evals" am: e8f19f3d am: c16665bc

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



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