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

Change-Id: If0c3d7d911b90a889202993e14088c612962f96b