am 66b0e2bd: (-s ours) am ff33471b: (-s ours) am 4c02d76b: (-s ours) am 719051f9: Merge "core/binary.mk: Add missing Objective-C objects to the build. DO NOT MERGE" into gingerbread
* commit '66b0e2bd':
core/binary.mk: Add missing Objective-C objects to the build. DO NOT MERGE