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

Change-Id: I024e763ada94b9a953e57564f76e80a964c728c9