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

Change-Id: I79517e5fc0713711d70eb4d2f28e2bbd7563c357