Merge "Revert "Remove auto-generated executable list""