Merge "New interpolator resources now found in interpolator/ directory" into honeycomb