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

* commit '4b42e5d663c3339b257036aeb81eb13b41b0bd17':