Merge "Skip building libfs_avb for darwin host" am: db2bc1a9df
am: 3cd91d9cb7

Change-Id: I1c65a0e2686d1691765b043643ebd8118ddc1a98