Merge "Refactor experiments to allow multidex analysis" am: 91b42b0014
am: 6e4e474d7f

Change-Id: Ic8cdbe26e904fec1d7788b7d3d410dca9923998a