Merge "Build both static and shared lib."
am: b0719e3aee

Change-Id: I785fa3aa125841992cd859a69ce76834ae299759