Merge "libfs_avb: support rollback protection for Live GSI" am: 084d3b9124
am: 5d1bb2a41f

Change-Id: I1029206aa4fce39095decbb96312200c75bf95c2