mako: Switch to CM's unified kernel

Change-Id: I865466d38d47f4716f36bc02ce378f0525552925
Signed-off-by: Rohan Mathur <rohanmathur34@gmail.com>
Merge "mako: Switch to CM's unified kernel" into jb-mr2