Merge "Revert "Full-stack integrity: check vdex contents."" am: cc4e7b7c7b am: 1ccc6c6d68
am: 9f879ea059

Change-Id: Ib13b6e3e8fd80fccbb181b77dc46386e5ff38c9f