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

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