am fa28e3e4: Merge "Use a separate apk module definition to add core-tests resource." into gingerbread

* commit 'fa28e3e404f1a417717ccc31220c0ef427efd827':
  Use a separate apk module definition to add core-tests resource.