Merge "Put the deoptimized method in the trace tag." am: 2fb49ebea1
am: 526cbb944c

Change-Id: I82e7f9c2346c49f50d375e7ddf614b98cdf47b08