Merge "Temporarily always enable dexlayout output verification."
am: 22d121f5f9

Change-Id: I41063f78108db618812e8f89b36bda2992c0860c