Merge "Track library change in libcore." am: ed9c176e16 am: 301f1d3645
am: cef08e7482  -s ours

Change-Id: Ide1ba5f3864e13376e15c561a911d5e2394328fa