revert aosp libcore