am 4f941812: am e967ee49: Merge "Fix gingerbread FrameworkCoreTests makefile." into gingerbread

Merge commit '4f94181282e7f23d19a5fcab5f1b93d6d52e7715'

* commit '4f94181282e7f23d19a5fcab5f1b93d6d52e7715':
  Fix gingerbread FrameworkCoreTests makefile.