Merge changes I9677ea07,I88f6252c,Id4871f31,Iab45c543,Ib2ad67e3

* changes:
  Made UnsafeFactoryInstantiator compile
  Update to 2.5
  Fixed update_source.sh script
  Restructure files to match upstream objenesis
  Fix objenesis makefiles