Merge "update shared libraries for system apps" into nyc-dev am: 689c92db9d
am: 69b47a2010

Change-Id: I73da3e3a7ffe88f69e9af28d65e5d695ffc1a1bb