Improve handling of generated include dirs
am: 57b9e1da75

Change-Id: I1ae18368680d6d73d1c9094354769d5923777b15