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

Change-Id: I990ca89cfd36271813e5af4bcad479290bee2502