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