Merge "Compile manager-lib shared library" into oc-dev
am: fe4705facb

Change-Id: Ia54a09338625ddd4006b4c831e6000317ce69ede