Merge "Use android::base::NoDestructor for static variables"