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

Change-Id: I8adb0c9be2f40cf8b5c91bee40267e551d4974ae