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

Change-Id: Ia18da3d59fc0043ae9cb2ee5cc0cd2fac00fdc47