Cleanup some usages of include_dirs
am: 4345aacf58

Change-Id: I1bf32db48bb27b9567fba093c7a3b5ea9dd57c72