[rebrand] minor @echo @APP_NAME@ instead of kodi/xbmc
CHG: [droid] refactor packaging to allow obb google extension apk
[pvr] Fix unexpected sub channel merge in EPG grid

Using backend channel number, number would be not unique if any sub channel exist.
So don't use it to sense channel breaks. Use unique channel identifier instead.
Merge pull request #5564 from janbar/fix_gridSubChannelMerge

[pvr] Fix unexpected sub channel merge in EPG grid
Merge pull request #5108 from koying/chgdroidobb

[wip] CHG: [droid] refactor packaging to allow obb google extension apk
Merge pull request #5553 from uNiversaI/patch-1

[rebrand] fix minor @echo @APP_NAME@ intead of kodi/xbmc