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

Change-Id: I7804ea1ab06ad555ab073693b0091065e67b3584