Merge "Remove unused libraries"
am: 50d665574a

Change-Id: I8aac144a1b99172521d08f15fdd9b95939d10f62