3.97

Change-Id: Ifd9c8e24d9f00614971c0ba62f6a0aaf4da29d51
Merge branch 'jb43' of git://github.com/ParanoidAndroid/android_vendor_pa into jb43