am 31a536e1: am 57928364: am 53c38c88: Merge "Revert "Create a special CONSTRAINED font bucket in frameworks."" into mnc-dev

* commit '31a536e117ff750b49350d5dc7268239bfc2ff36':
  Revert "Create a special CONSTRAINED font bucket in frameworks."