Merge "Add EasyMock 3.1, Objenesis 1.2 and cglib 2.2.3"