Merge "LDPI: Update battery icons" into gingerbread