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

* commit '60dda9c44dfef577d8f95784c1554696882d83f7':
  Remove mkbootimg from the pathmap.

xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build