Merge "Fix string patch target retrieval in OatWriter." into nyc-release