Merge "Update preloaded-classes for Honeycomb." into honeycomb