Merge "Revert "Full-stack integrity: check vdex contents.""
am: cc4e7b7c7b

Change-Id: I724f6208b1a86539a7ad2540b5c19cc19a4db381