Merge "Revert "Exclude debuggable test config for 660""