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

Change-Id: Iffb619ee8a851943fa9a5f3f6df78ea19cd2d4c0