Merge "Fix the binutils issue for Mac builds (duplicate definitions)." am: 7c568cd5 am: 6ae1b216 am: 18bcd8df am: 1ce80156 Change-Id: If563f8416e4e7c57825889ff8fc6b003ced39655