Merge "Revert "Revert "Make the boot image non-debuggable."""
am: 776a802be3

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

Change-Id: I7c3068abc2040039d55accbc2b846652b39eb078