Merge "Also move vdex files from system_b."