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

Change-Id: Ibd5740974ced9118900fcd155c63c710fdba5193