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