Merge "Add regression test for vdex + layout combination"