Merge "Disable dexlayout_test on target."