Merge "Build both static and shared libraries"
am: 1787d17ec3

Change-Id: Ibbeb714926de262b54ef21e3eac9840055953fe4