Merge commit '08cf57d791e50ecafe2728a7617a6487aeb6d6d5' into gingerbread-plus-aosp * commit '08cf57d791e50ecafe2728a7617a6487aeb6d6d5': Fixes to granting URI permissions - take into account path perms.