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

Change-Id: I48e4c59d50959ee4ced72e0153f96b7280333385