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

Change-Id: Ic93056132507b56bcd75345157f5ad6729cadb9b