Merge "Fix Darwin build (by not building)."
am: 2b3f24a596

Change-Id: Ifb527b2876ce192aecde0825d009b7fed0097cc8