Merge "ART: Simplify CurrentMethodVisitor"
am: 6e7e0eaca0

Change-Id: Ia6885a2459b88a0002231a2f92b3de032c4076cc