Merge "Track libcore change b695412b529c8dced105867c6d9d7fd463a67714"