update
Merge https://github.com/OdysseyRom/android_vendor_odyssey into jb-3