Merge "Don't fixup proxy method arguments after invoking the InvocationHandler."
am: 8ccef7e842

Change-Id: I0cc6833afff08413672b57de57b3f89de45c2b2b