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

Change-Id: I98bc109b811deb6a79df58c5e25b6572fbb386e3