Merge "AVB: decouple vbmeta.img from recovery.img for non-A/B devices" am: 549325427b am: 97c1c9aaa3
am: 04530d41c3

Change-Id: I8a258e6b7ad69c61f7e7097a739939a883f1dde5