Merge "Remove LOCAL_STATIC_SHARED_LIBRARY usage"