Merge "vndk-def: Add regex matching to tag file reader" am: 3b3d95b42b
am: 7045a118d2

Change-Id: I1aa46c98e2a812854f2f191e144e4029d7a43ae9