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

Change-Id: Ia4911c9eed8f15648a3e457f698f3402b2458806