Merge "Track ErrnoException API changes in libcore"