Merge "Change Dex2oatLayoutTest to generate profile itself."
am: 48d08a4233

Change-Id: I5687718db1f0ceb10b88a34db907c3220e77bcde