Merge "Move back the boot image to debuggable." am: 104f22ec88
am: 4a38346d10

* commit '4a38346d10d77d29b2423648111a33f23bc88b61':
  Move back the boot image to debuggable.