Merge "Remove symlinks from include dir" am: 5158f491c6 am: 5582a7360a
am: 0360e714b8

Change-Id: I74d8495c913ad46396294390b49e9828653fab99