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

Change-Id: I6bc92a330ac59c0a668fa52a163b94ae109e20f6