Merge "Improve GenConstString, GenS{get,put} for x86"