Clean version of master, dexlibs problem though.