Merge "Track libcore change 336ffbe1f2870fef47f8e80da87c80d7e379b69c"
am: 50238ae

* commit '50238ae4b40203d19df95e062a4aca487968adc3':
  Track libcore change 336ffbe1f2870fef47f8e80da87c80d7e379b69c