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

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