Merge "Revert "Create a special CONSTRAINED font bucket in frameworks."" into mnc-dev