am 9b9da008: Merge "resolved conflicts for merge of 8c2d872a to honeycomb-plus-aosp" into honeycomb-plus-aosp

* commit '9b9da008867252af03fa4585dd13e018939d3803':
  Add ddmlib-tests.jar to sdk build.