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

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