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

* commit '0024c91409ae7c137ede27d10f67331720cede43':
  Clear more native pointers in finalizers

Change-Id: I343282660f701962241c73683023b19fdc7c7f32