Reapply "Merge upstream into keycodemapdb"

This reverts commit 65811724035aee404e98e994691f01fa6d0b48bc.

Change-Id: I16ccc0dcac4bf67886b49328ae95394c0821b52c
12 files changed