Merge "Expose __srefill for LP64 until we can fix the NDK."