Merge "Remove duplicate libraries that are provided by system modules"
am: a6128ad225

Change-Id: I6b024f410efbd96f92143fd994a55607f9ab7539