Cleanup some usages of include_dirs am: 4345aacf58
am: 874d8b4742

Change-Id: I805ca211952c4a6850d243313f34e81751c9913d