Merge remote branch 'goog/dalvik-dev' into dalvik-dev-to-master

Change-Id: I795687c11ca2e8443f7c8c264e209501dab9b2c9