Merge "Improve hiddenapi exclude.sh script"