Merge "AVB: decouple vbmeta.img from recovery.img for non-A/B devices"