Merge "Revert "Make dexlayout and profman build without libart""