Merge "dex2oat: Remove redundant "duplicate methods" warning with --debuggable"
am: 550c0aee52

Change-Id: Iac488b7dfa49f9dd4c33f284e015d401bf16ee72