am eed58605: (-s ours) am ebb611f8: (-s ours) am 137b049a: (-s ours) Merge "DO NOT MERGE: Bundle libc++.so into otatools-package."

* commit 'eed58605ae180d080e5bd1576e1744ed89d578d9':