Bump to 2.3.1 & updates for android-4.2.2