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

Change-Id: I6b7d16eca18dce3e2990464f3d1a34740ad8a8ee
xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build