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 noto-fonts."

Change-Id: I8cd9e22a2f845814b189f0a0c83404abcdb6526c