Merge "Reorganize font enumeration API." into oc-dev
am: 2ac9698271

Change-Id: Ie9bdcdb8d5997db421b783475e1058027cc4bb6f