am d0d8f90a: Merge "Reorganize settings in Google Keyboard" into lmp-dev

* commit 'd0d8f90a32b907b867f8fa934dc7582ff53a9a43':
  Reorganize settings in Google Keyboard