Use the actual parameter types in PSearchMethodFunc instead of void pointers
Remove an unused, misspelled define set on only one source file
Merge pull request #802 from mstorsjo/remove-unused-misspelled-define

Remove an unused, misspelled define set on only one source file
Fix the improper slice mmco setting
Merge pull request #807 from sijchen/mmcoslcfix

Fix the improper slice mmco setting
for PS error logic for EC
Merge pull request #810 from huili2/ps_error_logic_ec

for PS error logic for EC
Merge pull request #808 from mstorsjo/use-correct-param-types

Use the actual parameter types in PSearchMethodFunc instead of void pointers
Merge remote-tracking branch 'upstream/master' into travis.android