am 9ba0796e: am 60dda9c4: Merge "Remove mkbootimg from the pathmap."

* commit '9ba0796e37f38b40eb2182c2d277a2b272169342':
  Remove mkbootimg from the pathmap.