Merge "Switch from deprecated include_dirs to local_include_dirs" am: f2edfcd3f6 am: 83e36f9f95
am: 16b549a126

Change-Id: I53d19010d1026faac44509d7fe32e2d8cfb32d1e