Merge tag 'android-6.0.0_r26' into HEAD

Android 6.0.0 release 26

* tag 'android-6.0.0_r26':
  Revert "Create a special CONSTRAINED font bucket in naver-fonts."

Change-Id: Id812cc4b22172c02d28ae26147a6f132016dfdab