Merge "Fix jpeg lib path for 64 bit image." into tm-dev