Merge "Update libcore flag container to ART" into main