am 178ed2c5: resolved conflicts for merge of f761d642 to honeycomb-plus-aosp

* commit '178ed2c5c5fc72a9d6b47047df009dc5eaffbbc9':
  Add more sdk lib tests to sdk build.