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

Change-Id: If9f87fd5b5c357f9c5fb053607949657419e2999