Merge change 1867 into donut

* changes:
  Cleaning up whitespace in adb sources. Nothing more, nothing less.