Merge "Fix installing 2nd arch shared libraries"