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