Merge "Make dexlayout and profman build without libart"