Merge "Use computed salt for AVB-signed images."