Merge "Remove font symlinks hack" am: df792ee3f2

Original change: undetermined

Change-Id: I890a67df43166c0c2f7362896162e55901830c10