Merge "Add a header for string.h for strerror and memset" into honeycomb-mr1