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

Change-Id: I8bd286c5e424caa0dc9c020482aaff3255761661