Merge "Update checkvintf on build_mixed"