ndk-stl: Add back cstddef patch reversal