(cherry picked from commit 6ef4ecd826)
6ef4ecd826
Use an explicit input.xkb.foo namespace, not input.xkb_foo.
Add the FDI file we're using at the moment, until it gets into upstream HAL.