Use strpos() insteads of substr_count(). Bug 1358912

Change-Id: I68c42ecc0e9e3b03d3fd6e09468ce82407fdef70
Signed-off-by: Son Nguyen <son.nguyen@catalyst.net.nz>