Merge "Disallow duplicated classes on boot classpath." am: 4d6b54eb02
am: 9f9c195c4e

Change-Id: I9f44241ed738dd87d21c8f98e8cacb346687c2cb