Merge changes Id2bc87dc,I17c191ec

* changes:
  Fix naming of libartd-simulator
  Fix debug flag ordering