Merge "Handle includes for generated headers" am: 6f32f95b25

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

Change-Id: I2f5a84791ff7f396ae0b1cb571c46a8f9810f9f0