Merge "further cleanup memcpy fortify implementation"