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

Change-Id: I54b476ced8c6c3d7d53a7bf6c6c03cab95f42996