Merge "Make it possible to enable native debugging through debug flags"
am: 27ec302da6

* commit '27ec302da670ffddaf1278b5b7155b7742aa37fd':
  Make it possible to enable native debugging through debug flags