Merge "libc: use __bos instead of __bos0 for strchr." am: defecea27b
am: 1bdd0764af

Change-Id: I946be49da1f47916b170a00a2484605054258f54