Merge "Adding libfs_avb unittest framework" am: 0dd3725982
am: 4bbecc85e2

Change-Id: I3f1e368017a63633c115fa1088c57ac93c66c9d9