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

Change-Id: Iafe7dcfa34733a02bc32ce08234344cfcc4bec7e