Merge "Includes new static libfs_avb"
am: 13755d81be

Change-Id: I32582a4e196582140f6b40a46cf0761994c8a56a