Merge "Workaround for package-private framework tests in runtest." into gingerbread