Merge "Merge "Fix the binutils issue for Mac builds (duplicate definitions)." am: 7c568cd5 am: 6ae1b216 am: 18bcd8df" into oc-dr1-dev-plus-aosp am: 3e94cbac Change-Id: I9f586e155bcae9d27d41eb4d01111fd4efcc2995