Add kernel version and extra label if it's a non-CM kernel

Change-Id: I42aaa15c4e8b8e311dada7e030b4e3c1ffbee295
Merge "Add kernel version and extra label if it's a non-CM kernel" into cm-11.0