Merge "Re-enable dex verifier after dexlayout"
am: 0aff0fffa8

Change-Id: I525096367f802b9b729115c095577b70a657ef8a