Bring in Vigor
Merge branch 'jb2' of https://github.com/LiquidSmooth/android_vendor_liquid into jb2