Merge "Don't walk the libcore tree when finding tests."