cm: Update fingerprint/desc to latest

Change-Id: I81d2ce2872ed7534e2e1723f61c070b32575d4c8
bacon: Relocate disk encryption metadata

 * Due to an issue outside our control, we cannot put the crypto
   metadata in the userdata footer.
 * Move it to reserve4 and enable migration code.

Change-Id: I71b5d570e7022865b769239cb93528350de288fa
Merge branch 'kitkat' of https://github.com/AOSPA-legacy/android_device_oneplus_bacon into kitkat