Merge "first-stage mount: support using other avb_keys"
am: 54785507f0

Change-Id: Id72565d1d6396d1bf3426b9864e27f43d39aa350