mako 3.1

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