Merge remote-tracking branch 'goog/dalvik-dev' into merge-art