am 1ccc6742: am fd606bc3: Migrate to new keycode constants in keycodes.h.

Merge commit '1ccc674237fe5b0ed4a03161f0aa7067e4e6fbd6'

* commit '1ccc674237fe5b0ed4a03161f0aa7067e4e6fbd6':
  Migrate to new keycode constants in keycodes.h.