am d6679fbc: am 9412efdc: Merge "Don\'t build otatools.zip if we don\'t build the ota package."
am d6679fbc: am 9412efdc: Merge "Don\'t build otatools.zip if we don\'t build the ota package."

* commit 'd6679fbc7e3fdafa4b8b2f554f5f53fef00af696':
  Don't build otatools.zip if we don't build the ota package.

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