Merge "Don't break the build... update to 11.xml." into honeycomb