Merge "Fix shared library install dependencies outside of /system"
am: 0b3f97b0d6

Change-Id: Ia2ffd13b26825c495559565f3c4542815956f660