Merge "Rename hiddenapi config files"