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

Change-Id: Id0377af36fba49a8ed88d056e0c24dd1100d184e