am 78b8342c: am 97aed98b: Merge "Workaround doclava leaking ArtMethod"

* commit '78b8342cc0e85494bc590f05641cde6674ac17be':
  Workaround doclava leaking ArtMethod