am c9548518: Merge "Keep annotated classes in main dex list"

* commit 'c95485186a5075e7568198c47e7290980353ce1c':
  Keep annotated classes in main dex list