Merge "(kernel prebuilt) Retire CPUID and MSR from kernel" am: 9852b4bd2e
am: 52a1efdc50

Change-Id: Ie3a7bb25e158ded0fa1e363c5e9877d71cebdc86