Merge "Move pdx_tool into system_ext"