Merge "Revert "Exclude debuggable test config for 660"" am: 19b5915599
am: 71f4e332a7

Change-Id: I8329d0e9823ab4c30afc86ae315d60430d77d8bd