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

Merge commit 'e6899ef57ca0bea419992ab9dd83b8ca65854284' into dalvik-dev

* commit 'e6899ef57ca0bea419992ab9dd83b8ca65854284':