Merge "Build both of static and shared libs."
am: ec365b3787

Change-Id: Ide18b0e5db46a254f3fb90def4a5211b605e94c2