Merge "Clear more native pointers in finalizers"
am: a5ca0ca886

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

Change-Id: I5577b85c83da164c0cb4add151bab18cf1555c9a