Merge "Make dexlayout and profman independent of libart"
am: 35bf335738

Change-Id: I729cd1c8327def37b3e2fc1631c914fa618f3d9b