Merge "ART: Use C++17 extract/modify/insert pattern."
am: b7abcaff75

Change-Id: Iadf4507326461671a7617b75301093fddee153e3