Merge "Now have a final API 12." into honeycomb-mr1