Merge "init: switch out keychord id with std::vector match of chords" am: e6a878644c am: b93b91c7ef
am: 654b1e2a02

Change-Id: Ibd12834c97001096be38103e73f27b1254ec1e96