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

Change-Id: I579b9c5aeb6913829a483b18009c9019f8eb66c6