Various updates made to build with jb dalvik