Merge "Rename servicetool to pdx_tool" into oc-mr1-dev
am: 5807a85f7c

Change-Id: I1da3bc208c05aeda98abe1d54ad98763be701ef1