Before it created a lib directory inside the lib directory. (cherry picked from commit 23cc97f16b)
23cc97f16b