Merge "vndk-def: Add regex support to extra deps format" am: 5382b4e19a
am: f8627184fa

Change-Id: I5bf9e001b461ed674e23d16addcfc6922e78f3df