Merge "Remove duplicate libraries that are provided by system modules" am: a6128ad225 am: 855a425dac
am: 2d7208eb1d

Change-Id: I2766457b6a1b011b8094ba0d1f389a88a68caf22