Merge "Prevent dependency cycle due to system_shared_libs expansion"