Merge "Remove LOCAL_STATIC_SHARED_LIBRARY usage"
am: 60f0b06d19

Change-Id: I530df72ef5dc2c50a2304e5b2fe1ddff2ade2eeb