Merge \\"update shared libraries for system apps\\" into nyc-mr1-dev am: 6cecc8dc27
am: a4bef226cc

Change-Id: I888c88308bf81ad5678b8049ba67142625c6e0b1