Merge "Add android.provider.Settings.EXTRA_INPUT_METHOD_ID" into honeycomb