Union tag will be changed from `enum` to `enum class`. We need explicit
casting with enum class.
Bug: 225119187
Bug: 218912230
Test: m
Merged-In: I2401e66dc9d8bc511a601fcdce365e5f823576d4
Change-Id: I2401e66dc9d8bc511a601fcdce365e5f823576d4
(cherry picked from commit 1c4e9829ec)
We fix up a std::copy that was using the wrong container for
the end().
Test: TreeHugger
Bug: 206867060
Change-Id: I5b7700029db6a513b6fdf03c3449be973d639df5