Merge "Track API changes in libcore"