am 288de8e6: Merge "Replace a use of index with strchr."

Merge commit '288de8e67b5a2c2e6a19372a2b99f17ca17de2fa' into dalvik-dev

* commit '288de8e67b5a2c2e6a19372a2b99f17ca17de2fa':
  Replace a use of index with strchr.