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

Change-Id: Iac8e084302bf6b3e2f4fae5f910d7ac3a8e85a99