Merge change 8639

* changes:
  explicitly set the hinting level for android apps (to match the old default)