Fix trailing slash

Change-Id: I31aa5e07788c43b000b3de56968dc2183cbd46c3
Add vanquish unified device to build barrier

Change-Id: I2fd83a500f084183282dc89dd6840bce0af114c1
Merge branch 'cm-11.0' of https://github.com/CyanogenMod/android_device_motorola_msm8960-common into kk_mkt