am 5c3edc04: am 98da13bb: resolved conflicts for 6c3bf1b8 to stage-aosp-master
am 5c3edc04: am 98da13bb: resolved conflicts for 6c3bf1b8 to stage-aosp-master

* commit '5c3edc045b270ff32e0adaa20bd4cbb541d6b73a':
  Use zip -q for adding shared libraries

xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build