Merge "Attempt to make libavb test working in CI"