Merge "Remove more simulator support code. Bug: 5010576"