Merge "Link with actual headers instead of symlinks" am: 69615f86df am: c6f31807a9 am: 532fdd7a7a

Change-Id: Iab66656a53efe219f549898a221d9390fed6007b