Merge "Fix libminijail static build."