am 666f4c09: (-s ours) am b7d3c175: Merge "New SDK architecture. DO NOT MERGE." into gingerbread

Merge commit '666f4c0955d76e0792a58189b717a6666ed9935a'

* commit '666f4c0955d76e0792a58189b717a6666ed9935a':
  New SDK architecture. DO NOT MERGE.