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

Change-Id: I36979edeedb9d77f4f75d1e3686b1c47536cdca2