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

* commit 'f8852d5645f7507fbef2207be3f20b87e81449dd':