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

Change-Id: If0fce135eabe1923ab2cd0dde81e792c4ddf81c2