Add shared library targets. Fix a grammo from a previous CL. Change-Id: Icc683d3a73a542519a6ccefc0f653664f236c24b