Merge "Track libcore change 13331bc0dd87b029b194e5aca4487e38d18da188"
am: b039538

* commit 'b0395386b5d0386949eecc5d97aa35fa60a6c1a3':
  Track libcore change 13331bc0dd87b029b194e5aca4487e38d18da188

Change-Id: I05ab73aceb2fe122eed7756993757a9df643cfa4