Merge "Updating Froyo framework assets to Holo style Bug: 3362749" into honeycomb