Merge "Check for duplicate entries when using dexlayout"
am: 3fb852a88d

Change-Id: I06e43509c110114de2649c2e13cf6c89d3df2845