Make android-xml filetype membership more exclusive
Move xml semantic trigger config to android.vim

By the time the ftplugin code gets run, it's too late for YCM.
Either this was a recent change, or somehow the settings had been
cached to let ycm accept them the last time I worked with this
Remove "layout" param