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

* commit 'c01503d93b40382924e2ba6ce3f21f804d75c0e6':
  Fix libart files to work with javadoc