Merge pull request #1 from CyanogenMod/cm-11.0

HammerHead : Add proximity wake flag
hammerhead: Fix bluetooth UART device perms

Change-Id: I19b636709b7172e66372faaa28e2b3c4c224621f
Merge pull request #2 from CyanogenMod/cm-11.0

hammerhead: Fix bluetooth UART device perms
Merge pull request #3 from vmkogeretla/cm-11.0

Cm 11.0