Merge "Update build rules for VDEX"