Merge "AOSP changes to use KeyboardLayout to support the new DictionaryFacilitator"