Merge "Revert "install LIBS_FROM_GIT using python 2 and 3 where appropriate""