Merge "Revert "Add kernel BuildInfo classes""