Merge "Track libcore change 2729b8c4d26170."