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

Change-Id: I7da0fb6032d41d83a8ed3d105d896313c4f0c9b1