Fix merge derps

Change-Id: Id64b6d5fc4f883915352ac61195be97acdc487ae
Signed-off-by: Josue Rivera <prbassplayer@gmail.com>
Possible fix for airplane mode (1/2)
  Thanks fusionjack

Change-Id: I6f1a35b1d63381a70ae446f41dde2a74b69040d1
Signed-off-by: Josue Rivera <prbassplayer@gmail.com>
Merge pull request #3 from SlimRoms/jb4.3

merge latest slim