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

Change-Id: I824a8a1e989e0afbdcb02d553a31832243eb9b00