merge mako lollipop-release aka 5.0.1 kernel