Export include dirs for users am: f1db9c86a4
am: 7f0667c45a

Change-Id: Ia4e07a9c6904127c86a5355934df8d0d108f3675