Merge branch 'cm-12.1' of https://github.com/CyanogenMod/android_device_motorola_falcon into c5.1