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

Change-Id: I14488d8f89b557715f15300a39f00246c4bfa34a