Merge "Track libcore change 5458546631c65f6d375b6a1780d36d0abb5b95af" am: c75055e
am: bbe2b3b

* commit 'bbe2b3b3417d943c667a84697569a5c527b76b3f':
  Track libcore change 5458546631c65f6d375b6a1780d36d0abb5b95af

Change-Id: Idbe18f27e57d80107efc968d3f555f70df642b11