Merge "Use computed salt for AVB-signed images." into oc-mr1-dev