Merge "Skip building libfs_avb unittest for Mac"
am: 301b394a36

Change-Id: I5736dc7a4527a7a91ded176b150bf651061296a1