Merge "Make dexlayout and profman build without libart"
am: 42805fa0af

Change-Id: I1cb51fbe0317da44cb91946f04af681975d307d4