This will allow us to use torch app from CM

Signed-off-by: iceandfire <arhamjamal@gmail.com>
Fix power menu config

Change-Id: I8fd2d799565bf3f486e15ae39b0d348b095ee4e0
Signed-off-by: iceandfire <arhamjamal@gmail.com>
Merge branch 'jb-mr2' of https://github.com/TeamHorizon/platform_frameworks_base into jb-mr2
Fix reboot disabling in power menu

Change-Id: I8db504857d852ef0c18eb938934577032267ca0b
Signed-off-by: iceandfire <arhamjamal@gmail.com>