am b7d3c175: Merge "New SDK architecture. DO NOT MERGE." into gingerbread

Merge commit 'b7d3c175e25143cb75199d4e62418df5bc2e413b' into gingerbread-plus-aosp

* commit 'b7d3c175e25143cb75199d4e62418df5bc2e413b':
  New SDK architecture. DO NOT MERGE.