Merge "Add kernel info to compatibility.zip"
am: 5cc9230914

Change-Id: I0884bc155efe99f691af10eb2252cd223e0d9258