Fix the wrong shared lib name too. Change-Id: Ib98c55dfd1aee4a762dc96b12df3a463bef2ac80
Bug: 10100269 Change-Id: I883992c2033e7d9e7c754c0bf653767728b221b6