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

Change-Id: I1efdf28f00adf317391caf816e7cca3f4981dfd5