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

Change-Id: I1ee034dda7407c84110b8fa92a38a427d58203b5