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

Change-Id: I676c0cf9c4db0adf7dc8dcd89a7ec2023295a715