Merge changes from topic 'upgrade-mockito-1.10.19-dexmaker-1.3'

* changes:
  Fix upstream mismatch between cglib-and-asm source and library
  Fix some generic/casting issues
  Update to version 1.10.19
  Allow version to be specified to update_source.sh script