Merge https://github.com/CyanogenMod/android_vendor_cm into HEAD

Change-Id: I93ce18d4fedf1958b44c9b875b098bc07137998f