am 60db431f: am 4b724cff: Fix dx to match the new SDK structure.

* commit '60db431fe44afb723654a19494b1ba0f35a735f0':
  Fix dx to match the new SDK structure.