Merge "Patch for compiling art to run on linux target"