Merge "Using a dir /avb for DSU avb keys"
am: 1ef36b7491

Change-Id: Ibe5da14c8e8845dcaf59f5f0becacd5c352e2e33