am 97aed98b: Merge "Workaround doclava leaking ArtMethod"

* commit '97aed98beeb2c3831a9fc110aaca8b36fbbb7aee':
  Workaround doclava leaking ArtMethod