Merge "Fix shared library install dependencies outside of /system"