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

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