Fix broken symlinks

Change-Id: I9a5f7a8468232732a1dc231b7039612ee23a7f1c
Merge remote-tracking branch 'upstream/cm-10.1' into cm-10.1