Merge "Don't build otatools.zip if we don't build the ota package."