Merge "DeviceInfoSettingsTest: test parsing llvm kernel" am: 33046b4ec2
-s ours am: f25a418e24
am: e625c2f64e
Change-Id: If659955e693b8bae1aae5118fa7122fa2d287b3b
This commit is contained in: