Merge branch 'dalvik-dev' of persistent-https://googleplex-android.git.corp.google.com/platform/external/apache-harmony into merge-goog-dalvik-dev-to-aosp-master