[automerger skipped] Merge "Remove symlinks from include dir" am: 5158f491...
[automerger skipped] Merge "Remove symlinks from include dir" am: 5158f491 am: 5582a736 am: 0360e714
am: 21bbf7d1 -s ours
am skip reason: change_id Ibe4eee4fe49b7884e6d720e626d88125bbee0eb2 with SHA1 cf90b493 is in history
Change-Id: Iefeb35120a3412e4605fb534d720c8fcf2a53931