am 88440c53: am 5d88b3d7: am c4262982: Merge "Use the correct MKBOOTIMG."

* commit '88440c536ba0cfdd42e88378c952eb56f918f4a8':
  Use the correct MKBOOTIMG.