Merge "Add missing shared lib dependencies." am: 0d0b2bd1ee
am: be27e860ad

Change-Id: I3b4f5bfaa95c0b6b3717f11c20ba03c6185d7de9