Merge "Include string.h for strcmp." am: 7dc7c3a9c6
am: 756c3f105a

Change-Id: Ie6d3138f985dc213dc168202a968e9ebafead1a4