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

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