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 'ff33471b8bb548643bb9624ee4866ad6e4713bf8':
  core/binary.mk: Add missing Objective-C objects to the build. DO NOT MERGE