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

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

Change-Id: Ie0aed35e1ca10e3ca90b4b43ad8c411a9e24852a