Merge "Remove font symlinks hack" am: df792ee3f2 am: f369e4f670 am: 572f829f7f

Original change: undetermined

Change-Id: Idec39c2a5e58b1c726968c271b3b77b6d8605146