Merge "Clear more native pointers in finalizers" am: a5ca0ca886 am: 8521a8ff86 am: 0024c91409
am: f58e63b005

* commit 'f58e63b005a0b51ecdbcb56f2e246a897f85f5cf':
  Clear more native pointers in finalizers

Change-Id: I3e6d6bc03c05b57e4cad96ced7b7f0dfe00b582b