Merge "Fix gingerbread FrameworkCoreTests makefile." into gingerbread