am 037b9bcb: am c01503d9: Merge "Fix libart files to work with javadoc"

* commit '037b9bcbd89a5cbbf90e1f2bd55ed5da88aa46e1':
  Fix libart files to work with javadoc