Merge "libfs_avb: adding two public APIs" am: c7b5c4fa6b am: 0e9c7e3d0c
am: 97d875b2e8

Change-Id: Ic90dd44d63e2f55d921da52a190f2d4e94aba4cd