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

Change-Id: Id6919572db33f57a03744c080e0a2621f11376aa