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

Change-Id: Ib981881b58c7e2fe789b73498f5764a8ef45d64e