Merge "Don't emit multiple copies of annotations when merging dex files." into dalvik-dev