Merge "libcore_failures: Remove obsolete entries."