Merge "DO NOT MERGE: Bundle libc++.so into otatools-package."