Use aosp keybord

This reverts commit 28007133331aee1b51fc694bdb23d34986d50c25.