am c4262982: Merge "Use the correct MKBOOTIMG."

* commit 'c426298280cea52af693ce76fe8643012ebe54b2':
  Use the correct MKBOOTIMG.