Merge "Unhide getWeight of Typeface" into pi-dev am: 1b8333d1fb
am: e039c5f543

Change-Id: Ied7efc7895fe1a38352ea49c21c3cd136716fef2