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

Change-Id: Ie3ae92d62d787d740a5c856e58ccc819705b2d0e