Merge "Keep annotated classes in main dex list"