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

* commit '5d88b3d7d615995c6b1909992347fe0b5692492e':
  Use the correct MKBOOTIMG.