Merge "Remove more header symlinks" am: a2bc7eada8
am: ec565c575d

Change-Id: I6543832b9aeb3611d077c9e8775c0b7610bb97e2