Merge "Fix strstr16." into nyc-dev