strchr and strrchr now return const char* instead of char* Change-Id: Idc013222e86c80b1e91d5aeb09a1a24809a82358