Make sure data and binaries go to the right place on Mac

Change-Id: I7dc2ef2447bfae7e6ea6f0d263a85f34a8b4a08e
Merge branch 'mac-install'

Change-Id: I1479b885f768248d6f232f962bcf11011a456ba1