Merge "ART: Refactor test profile generation"
am: 0544d2f14a

Change-Id: I4c24c7b9099ab440efa1c55fc797bb0789db8506