Merge "Code cleanup around vdex."