Merge "Move SDK component to API 10 + codename." into honeycomb