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

Change-Id: I6a17dc8691cf35d6481606b3541e12f411381541