Merge "Code cleanup around vdex." am: 2ec2b28686
am: 0e11abcdcb

Change-Id: I1f23c90db7f1979621f64bbba49622d2653e8078