Merge "Remove old APIs." into honeycomb