Merge "Prevent dependency cycle due to system_shared_libs expansion" am: 112e384675
am: 88f0b5a718

Change-Id: I6ffda0974c7f3b28c53290b9a3f1a8c49a2d3fce