Merge "Remove the simulator target from all makefiles. Bug: 5010576"