Merge "Make the boot image non-debuggable." am: 0844e03ba7
am: 4ee2919b1a

* commit '4ee2919b1aa9afc96630653536878ca917ae9b0f':
  Make the boot image non-debuggable.

Change-Id: I7abb512e50e902ac908b668a483bfff9bc8b411e