Merge "VINTF test: use CheckFlags namespace." am: e74e2ee1b6
am: 894a207391

Change-Id: I80475b80bfb48c165abca594ed0b5246640d846c