Merge "Includes new static libfs_avb" am: 13755d81be am: 944194715d
am: 2c0edb55c0

Change-Id: I62288482fb2d9880c9e8dc5238bb06162a18df7c