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

Change-Id: Id54aa3ba3a1702aa4f8bcbecf01b94d3cefaf1d7