Merge "error: no matching constructor for initialization of 'std::ifstream'" into aosp-main-future