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

Change-Id: Ic8e81f8554ab40239aa3e3d570b1e12089a3b07e