Merge "Revert "Make dexlayout and profman build without libart""
am: bae5e4e8e1

Change-Id: I1ed6b3befb8963cf34893a5e92e1951404c2a01e