Merge "Prevent dependency cycle due to system_shared_libs expansion" am: f56dad3fff
am: 5c22f8341b

Change-Id: I77f2bd140fc1c6a8c94794738a7e701830d5fc30