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

Change-Id: If7bff6474d7a9484c55ff55746f3d2a7b6b1af1f