Merge commit \'27604fcbee0010b800bfc16b5bf7a48c365c2cf3\' into mnc-dr2-dev-plus-aosp
am: 8b254cfc3c

* commit '8b254cfc3ccb67953b62412b0a453f382907b841':
  applypatch: Refactor strtok().