Merge "Don't reset LOCAL_*MODULE_STEM."