Merge branch 'fix_merge_libs' into 'master'

Fix merge libs and update README

See merge request !285

README.md

@@ -6,3 +6,6 @@
 
 Supported Devices: **CPU(NEON)/GPU/DSP**.
 
+## User Guide
+
+wiki url: [http://v9.git.n.xiaomi.com/deep-computing/mace/wikis/User%20Guide/introduction](http://v9.git.n.xiaomi.com/deep-computing/mace/wikis/User%20Guide/introduction)

docker/README.md

-# 包含mace环境的docker镜像
-========
+# Usage
 
-* Login in [小米容器仓库](http://docs.api.xiaomi.net/docker-registry/)
-
-  ```
-  docker login cr.d.xiaomi.net
-  ```
-
-* 使用`Dockerfile`编译镜像
-
-  ```
-  docker build -t cr.d.xiaomi.net/mace/mace-dev .
-  ```
-
-* 或者从镜像仓库直接pull镜像
-
-  ```
-  docker push cr.d.xiaomi.net/mace/mace-dev
-  ```
-
-* 启动容器
-
-  ```
-  # Set 'host' network to use ADB
-  docker run -it --rm -v /local/path:/container/path --net=host cr.d.xiaomi.net/mace/mace-dev /bin/bash
-  ```
+Wiki url: [http://v9.git.n.xiaomi.com/deep-computing/mace/wikis/Docker%20Environment/Usage](http://v9.git.n.xiaomi.com/deep-computing/mace/wikis/Docker%20Environment/Usage)

tools/merge_libs.sh

@@ -42,6 +42,7 @@ else
   echo "addlib bazel-bin/mace/kernels/libkernels.a" >> ${LIBMACE_TEMP_DIR}/libmace_${PROJECT_NAME}.mri
   echo "addlib bazel-bin/mace/utils/libutils.a" >> ${LIBMACE_TEMP_DIR}/libmace_${PROJECT_NAME}.mri
   echo "addlib bazel-bin/mace/utils/libutils_prod.a" >> ${LIBMACE_TEMP_DIR}/libmace_${PROJECT_NAME}.mri
+  echo "addlib bazel-bin/mace/ops/libops.lo" >> ${LIBMACE_TEMP_DIR}/libmace_${PROJECT_NAME}.mri
 fi
 
 for model_output_dir in ${MODEL_OUTPUT_DIRS_ARR[@]}; do