Merge branch 'cm-12.0' of github.com:CancroCM/proprietary_vendor_xiaomi into cm-12.0
Merge branch 'cm-12.0' of github.com:CancroCM/proprietary_vendor_xiaomi into cm-12.0
Revert "update com.qualcomm.location apk"

This reverts commit 7c2f01e50d3dcc02bd765dad3989df08f419d9d7.