Merge "LDPI: minor cosmetic change to battery icons" into gingerbread