Merge "Add VINTF files to bug reports"