Merge "Add libc++ as static library"