Merge "Remove unused library definitions." am: 706089fff2 am: d04686f435
am: 625ea17ce7

Change-Id: I3abd7671c2cc139737904aaecc5678dcde20aae0