am f8e4a097: am 8a0014dd: Merge "Call JNI_OnUnload when class loaders get collected"

* commit 'f8e4a0972f415311ce61a9f76ef10e2d15481423':
  Call JNI_OnUnload when class loaders get collected