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

* commit 'ebb611f8d3911434072611cb0e48302fc9ed1226':
  DO NOT MERGE: Bundle libc++.so into otatools-package.