am a1d0e5ed: Merge remote branch \'goog/dalvik-dev\' into dalvik-dev-to-master

* commit 'a1d0e5ed9c6879d29382d0bdb287c9a9a2234127':