Merge "Add regression test for vdex + layout combination"
am: 9c69e59864

Change-Id: Ic25b4498a29a5ca02af29e560d3f350f68385449