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

Change-Id: I91a575df26583156e0dc450a5d591d65051b3c71