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

* commit '33b5dfb684910c5dbcd0e58f24a90ead01078629':
  Fix dx to match the new SDK structure.