Use the six callback checker

Instead of using the collections isinstance
check use the one provided in the six
module that takes into account other ways to
detect callability.

Change-Id: I626338048a47cea75a29776cadca250e373d2cc7
Merge "Use the six callback checker"