Merge "Upgrade to current upstream scanf implementation."