kick aries
Merge branch 'cm-12.0' of github.com:CancroCM/proprietary_vendor_xiaomi into cm-12.0
cancro: add keymaster props from hammerbuild

Let's test with these hammerhead props