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

Change-Id: I04672169e6da633445e5a62986f9143acf3f394c