Merge "Prevent dependency cycle due to system_shared_libs expansion"
am: c69218d47e

Change-Id: I709db052bd477637106d4469636f8cf6eddbac13