Merge "Track libcore change b5d045f7e4023c0ba9a42fb95efad4c30dfc085f"
am: 32e9299fa6

* commit '32e9299fa6dbb82fc23c7b6eac6834f5081a62b1':
  Track libcore change b5d045f7e4023c0ba9a42fb95efad4c30dfc085f