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

Change-Id: Ife8d93c19f6ff3a9823f12e565f01c81084dceec