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

Change-Id: Ide8cc6afd7f8bae9509d067106e3b614df1b834c