Merge "renaming CacheableTextView -> CachedTextView" into honeycomb