Merge "Update build rules for VDEX"
am: 3a04e1b82f

Change-Id: I6f50ba38c35277892ecc1fcc262eed9ffa533aa5