Merge "vndk-def: Add regex support to extra deps format"