Merge changes I9677ea07,If02819bd,I91c141ef,I9a1b61c6

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