am 5495a72a: Merge "Make class loaders weak roots"

* commit '5495a72a8718c2b3156603158a932a8c4b403de5':
  Make class loaders weak roots