Merge remote branch 'goog/dalvik-dev' into mm

Change-Id: I4346c9891939e589c627b9de4d71b959ed8f3b51