Merge "Revert "Make the boot image non-debuggable."" am: f7e1ab5224
am: beafc1f18d

* commit 'beafc1f18d934c24095fac15c3290a224befe896':
  Revert "Make the boot image non-debuggable."

Change-Id: I90a0084e9f91b4f65e341c0100f93bbd43b0d710