Prevent dependency cycle on linux_bionic due to system_shared_libs expansion. am: 759026fed9
am: bf51fc27ed

Change-Id: I37f7b06ffc8cf5d31a84b6d9eb04cd862c98c548