Merge "Ensure the GC visits Obsolete Methods"
am: 9e2a1cadf7

Change-Id: Iff290543e5e65f247913bbe6b442a377962c7e27