Merge "Remove more header symlinks"
am: a2bc7eada8

Change-Id: I690dd345b0a74078b7cae24bdf3fdb2549d8c62d