Hide static from cc_library_shared and vice versa am: f383ed8b60
am: 28b205a9ac

Change-Id: Ibe8ec7ff5805f56794d865d37263af8b64c348e0