Revert^2 "Remove variants of vdm flag library"

da17bccdcbdc16a782ca09264e5b8b4cd16e30b7

Change-Id: I11c4eccbbd0b29cbcea6a5aef9eed156dd4b4ebf
1 file changed