Merge "Updated HDPI btn_default states from Gingerbread" into honeycomb