Merge "Track library change in libcore."
am: ed9c176e16

Change-Id: Iae6166cf055625947589b3a14b72ed7828738311