Use CommonArtTest for dexlayout, dexdiag
am: a8d23cb7fe

Change-Id: Ib967a3257728e654db412d08ea85d099ad726e9e