Merge changes Ic2da319f,I9e90029d

* changes:
  ART: Remove art and art/runtime include_dir directives
  ART: Move cmdline parser to header library