Merge "Don't modify LOCAL_STRIP_MODULE"