Merge "libfs_avb: refactoring" am: 29bc428f28 am: 8912ea15c8
am: 1ab8319647

Change-Id: I6cbaf0b76bbba5d7d178e6790e1d04d5f131c43b