am d7d15831: Merge "Update the SDK platform components to API 11." into honeycomb

* commit 'd7d15831d79aae53e2b7d9d402a2503e9f68dc98':
  Update the SDK platform components to API 11.