Merge "Revert "Update ddmlib prebuilt on 2023-04-26 02:02:07.595952""