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

Change-Id: I1ac99b2d55b732f8027e2d1f3f1265a4f737d668