* commit '1d1a3d52':
  Fix a bug where null would be converted to "null"

It's unclear what the concrete effects of this are, but they are not
very strong. This only happens in corner cases, when the input
connection is not active - while rotating, for example.

Change-Id: I1d22459a6e94a8ecccb53cfcbc2d301b1d502204

* commit 'baa31217':
  Update resources

Change-Id: Ia66f7181514ee1471e181e16d15622174cf72e79

* commit '2e3c1106':
  Address a couple issues in Khmer layout

bug: 6910993
Change-Id: I649b2d37a4eca75e2fc98e8c7f6a3dad20339864

* commit 'edbbd53c':
  Import translations. DO NOT MERGE

Change-Id: I168cfa8bfa7c4762d50db3675f34282e3b61297b
Auto-generated-cl: translation import

Change-Id: I6b6b1607837a2ac28c732697c6e9192a8ef68a63
Auto-generated-cl: translation import

* commit 'be5e21ec':
  Add Khmer layout

bug: 6910993
Change-Id: Ie515acd625bc266494d9e63b0694e2c05a19b661

* commit '72503243':
  Add showSuggestionStripWithTypedWord.

* commit '5fe31f23':
  Show Emoji category page id indicator

Bug: 10814472
Change-Id: I3a150124baf7a9b7889b033089a859ff9c11e206

Bug: 10538430
Change-Id: I767fa8d41c789125af266f2203b4bad7452bc0a5

* commit '80f934af':
  Add comKeyStyle

Bug: 10822107
Change-Id: I411a2427e759e83366bbf7a525b9ab8a1ab3144d

* commit '7ba78687':
  Add Ver4DictDecoder.

* commit '11ce0545':
  Fix hitbox of emoji key

Bug: 9618601
Change-Id: I43c5840505c6a847aaf4893a400392ccd45903c0

* commit '926ee64b':
  Add a new option for version 4 to dicttool.

* commit '4c5e6634':
  Groundwork for implementing GC.

Bug: 10780368
Change-Id: If10c18fdb0e7f0b0460a721d55001ab0fef28664

* commit 'ff493744':
  Quit skipping user history dictionary for gesture.

Bug: 6669677

Change-Id: Ia2b2f338795ab62cc9eef73731285b2a5a0ac5e4

* commit '6f68b736':
  Fix an off-by-one error.

* commit '284e73bd':
  Show emoji key on PC layout

These variables were meant to represent the (x,y) coordinate of the
last pixel of the grid, to avoid going one pixel too far. But the last
pixel of the grid, of course, has coord (width - 1, height - 1).

This bug only ever happens in a rare case because to reproduce,
it needs the right (resp. bottom) coordinate of the rightmost
(resp. bottommost) plus the threshold plus half the grid width
(resp. height) to be exactly the number of pixels of the grid,
which is pretty unlikely... unless there are more tiles in the
grid than pixels on the screen, in which case the grid width is
1 and this becomes likely.

This fixes the fencepost error and renames the variables to
clarify their meaning.

Bug: 10537485
Change-Id: Iecfe2c0f29ee17776ee2cceaa4b1db722276b1f3