Merge "ART: Dex2oatd does not depend on libart-nond"
am: b3019b96ef

Change-Id: I126a5197dd4e78ba4fe76b4e1943e6b55d1c03f7