Merge "Add missing shared library"
am: 65e3e8da22

Change-Id: I80801b43e0b83665fd648ce61e1c48052b907851