Merge "Don't specify LOCAL_STRIP_MODULE for static libraries"