Merge tag 'android-6.0.1_r3' into 601r3

Android 6.0.1 release 3

* tag 'android-6.0.1_r3':
  Compile the hyphenation patterns to binary

Change-Id: Idb52bf981ac683902b1d819f9abf644c0a3f8e34