Merge "Cache the Typeface based on the FontRequest." into oc-dev
am: 5b96e55d90

Change-Id: Ic185a25c605e7345afa214d3b50fd859135f7b9b