Merge "ahat: support java.lang.ref.Finalizer" am: ca182f2c81
am: f52f9228d5

Change-Id: Ibb1f9dcbc49964f0861a5866d8ef61520565c54a