Merge "Use static_libs for androidx dependencies"