merge in jb-mr0-release history after reset to jb-dev
Merge branch 'jb-mr0-release' of https://android.googlesource.com/platform/dalvik into aosp-merge
Merge branch 'jellybean' of https://github.com/CyanogenMod/android_dalvik into HEAD