Merge changes 2853,2885 into donut

* changes:
  Misc updates on the Sdklib.
  Export all ADT packages.