Prevent dependency cycle due to system_shared_libs expansion am: 35edf4582e
am: cf416b63b1

Change-Id: I3d902e4204c540b41d34a50bf60d3173f608515c