Merge pull request #8165 from lioncash/linkage {Android/ButtonManager, ResourcePack/Manager}: Make file-scope variables/functions internally linked where applicable
