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

Change-Id: Iea85964ca4ee5557599858572864b51ea7dd53f3