Prevent dependency cycle due to system_shared_libs expansion
am: 35edf4582e

Change-Id: I355c846fa3a624047ac4a83846ed298e70b449e7