[automerger skipped] Merge "Remove symlinks from include dir" am: 5158f491c6
am: 5582a7360a
am: 0360e714b8
am:gugelfrei21bbf7d12f
-s ours am skip reason: change_id Ibe4eee4fe49b7884e6d720e626d88125bbee0eb2 with SHA1cf90b49317
is in history Change-Id: Iefeb35120a3412e4605fb534d720c8fcf2a53931
commit
5ecadb3b14