Merge "libcore_failures: Remove obsolete entries."
am: 0078d61a9c

Change-Id: I79e026372c71c781219482a454e9d84b801d1469