Merge "Disable troublesome Mac build."
am: f9711a9365

Change-Id: Ic803f8408a6a71a96ce76c4b9f78924ed8a9e55f