Merge the only useful difference from the libcore duplicate.

Change-Id: I7a1f1d90622c31ced086bce2c40d0d644d2772af
1 file changed