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

Change-Id: I9663b7a219d34114bdb5729aa9f185cfb7446a15