Merge "Add missing shared library"
am: 45fe08687e

Change-Id: Iac9690e6d3774117924ffe165e51a181badde08a