Merge "Do not fill DexCache methods in resolution trampoline."
am: c5e7180231

Change-Id: I0fe824ddadaba722efba7f1189588bcaded55176