merge in jb-release history after reset to jb-dev
Reconcile with jb-release

Change-Id: I498b24819154fc97ab5f846cd088810d68a982ea
Merge tag android-4.3.1_r1 into dev-mips-jb-mr2