Merge "Use computed salt for AVB-signed images." into oc-mr1-dev
am: f7ade144dd  -s ours

Change-Id: I8b7f1df5249c10f50639fefd081213745056da90