Merge "Remove almost-all android::Singleton users"