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

Change-Id: Ifd5ce722f69e24de9e8059248436a1f648374b1a