Merge "Use computed salt for AVB-signed images." am: 4655de40c1
am: 815b445c14

Change-Id: I66595bd6b306806052559960c12e6f70d30cb8de