Merge "Revert "Remove unused library definitions."" am: 9ca75f0441
am: fa990c3402

Change-Id: I6b3d59aaa7f2fb803dd4c80a1ad251c4bda663a1