Merge "Revert "Revert "hammerhead: update prebuilt kernel""" into mnc-dev