Merge "Track changes in libcore" into pi-dev