Merge "vndk-def: Add regex matching to tag file reader"