Merge "Fix retaining of granted permissions when updating of system app." into gingerbread