Merge pull request #4373 from koying/fixamcrk

FIX: [mediacodec] blacklist rockchip non-standard components
Merge pull request #4345 from cg110/OptimizeIsSamePath

Speedup FileItem::IsSamePath
Merge pull request #4393 from xhaggi/fix-channel-manager-masterlock

[pvr] fix: password prompt appears twice if set icon in channel manager
Merge pull request #4394 from jmarshallnz/album_info_files

Album info files view was broken
Merge pull request #4371 from jmarshallnz/runaddon_fix

Runaddon fix - allows secondary extension points to be run