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

Change-Id: Id113b1736078bc7f50177db64c85987eb2bbac85