am 7642d13b: Merge remote-tracking branch \'goog/dalvik-dev\' into merge-art

* commit '7642d13b320eccd98cfd424f160a1a6a2e49cbde':