Improve handling of generated include dirs am: 57b9e1da75 am: 8f2425e6b4

Change-Id: I5f1c7edb44b3cc4827895587ffc4aa902f725f00